Fixing build for 1.8.7