1.0 final fix