Temporary fix for null schema in map