Partial fixing up expansion