possible fix for issue #9