Fixing 1.8.7 regression