Fixup the thing where its not working correctly over there