Clean up fix.