Last minute bug fix.. Huh :(