pick up issue #23 bugfix