Strict check-up; fix