Fix attempt 2.0