Fixed another 1.7 bug