Fixing collection scaffold.