BUGIFIX: closing issue #16