Fix bundle on 1.8.7