bugfix for issue #11