6.0 final fix