Fixed strict compliance