fix support dependencies to 21.+