Possible fix to issue #10