Fix for 1.8.7

Again