Fix for disabling map