My ordering comment above should require this to change as well.