Fix for a bad cleanup.