Bugfix for last Commit