Get the correct behavior!
Cleanup