Fix not removing the current map from map options

when AllowExtend is false.