fixed comaptibility to 1.18