#2 final fix