Fixed the damn bug