Fixed defect caused by argument lists and map behavior.