Fix issues with 1.7.10 not working.