Minor bugfix
Further bugfix