Last minute bugfix, yay!