Bugfix, hopefully