fix variables in 2f150aa, update #1476
NEXT: add f58e61d to #1476 for 1.18.4