Does not actually fix BC#43949081