bug fixed(Model & UI)