Bug fix: Regression of issue #436