issue #55 - bugfix