issue #8 bugfix