Map 02: bug fix