Stupid fix for strange behaviour in app