Fix order of slots