Initial 1.7.10 commit buggy