fixing 1.8.7 syntax errors