Checked 1.111 compatibility