crappy merge, fixed