Bugfix (try 2)