OK, I mean it this time, the overlap bug is history :P