Fix Lib 1.53 after last commit