should fix syntax errors on 1.8.7