Should fix 1.7 compiler now.