Attempt at 1.8.7 fix