Last fix for issue #151