fix upgrade to 2.3