fix bugs for IMS 2-3