Hopefuly fix a bug with things breakig