Fixed a bug that emerged in the last bugfix.
Merge branch 'master' of https://github.com/Sebastian-D/patchwork