bugfix for issue #15