Fixes last bug with 2.10