FIX: Crashes after map expansion in some cases.