Fix 1.8.7bw build