1. -Fix some bug