Finally fix 2.0 issue