Fixing the 1.8.7 support.