big hack in order to avoid deadlock