Fix for issue #144