fixes ZEN-15717

DO NOT MERGE
Is this still correct?