Fix 1.8.7 parsing and skip