fix 3.19 and complete 3.18