another attempt at map bug fix