Fixed expansion initialization bug