Continue fixing bug on smart-expand.