Continued fixing the compatibility issue with 2.13