Fix problem in 2.3