Bugfix for previous commit
Merge remote-tracking branch 'parent/master'