messed up, updated with old source last time, so brought old bug back, sorry!