Possible fix to issue #72