Added expand debug check