Fix parsing errors on 1.8.7