BUGFIX: issue #40