Fix for STRICT mode