Fix https://jirapdi.tid.es/browse/OWD-24197