Fix of very ugly bug