Hopefully fix issue with 1.8.7