#21 map bug fix