Modifications for strict mode