Fix: losing map in BT void