More 1.7.2 work