Bugfix: issue #2014