Fix Required attribute issue