fixes ZEN-15602