fix for issue #161