Cleanup fix.