Fix the damn bug