Fixing bugfix