Fixes regarding issue #7