Workaround to make it productive
Horrible horrible fixes