changes regarding issue #144