Possible fix to #64