Remove silly hack, was easily solvable after all