fix for issue #139