Missed the main changes in defer bug fix.