Bugfix for real now