Bugfix for issue #210