Possible fix for issue #10