some fizes on 2.0