Tentative fix for CR-718 and CR-636