Possible fix to non-default data