Required fields fix