fixed the support for 5.[23]