bugfix for issue #2