fixes ZEN-15717

DO NOT MERGE
why the continue vs break?