Fix issue55: bugfix