Port for 1.7.10