Fixed 26969 hopefully.