BUGFIX: closing issue #2