BUGFIX for issue #5