Possible fix for #838

See #838