Possible fix to issue #61