issue #28: bugfix merge error