Fix support for 2.5