[dev] some fix