Possible fix for issue #5