(m) Bugfix for last commit