fix for issue #151