- Fix for issue #139