Further bugfix