Implement fix of strictness in Raw