another fix of the expansion part