Fixed unavailable class not removed from map