Compatible with 1.7.5

Still need to test this