othiym23: we need to fix it properly, but that contains a workaround