Small bugfix
Merge commit 'fe03418'