Major bugfix >_<