fix for issue #131