Blind fix attempt 2