Bugfix FOR REAL NOW