Cleanup fix