Revert "fixes #84 (fix from Diego)"

This reverts commit 2504c3e18380e4ef015cacf781d6cb57a6f55eac.