[SECURITY-841] / [SECURITY-826] Repair 'Continuation Required' logic