some fixes regarding issue #3