Crucial bugfix, yay!