Map 01: bug fix