fixed couple validation errors