fix for issue #91