Tentative fix for CDE-123 and CDE-136