Fix435 and Fix522

Close 435 and close 522 issues.