Bug fix for issue #139