fix changes to 1.11.17