Quick fix 1.16.1.2