fixed version 1.22 problems