Fixed error in 2.20