fix for issue #87