fixed issue #14 (i think)