fix for issue #164