Bugfix for expand