Clean up fix