Fix to work with release/2.5.2