Fix attempt 2