Fixing Redmine issue #4851