One more bugfix