7.x collation fix warning