Potential fix for 1.7. UNTESTED.