fixed bug of 1002 (again)