possible fix for issue #164