Okay, NOW we're fixing a bug