Fix expanding problem