map bug and toggle