this fix works in every scenario I've tested it although seems very fragile