Fix a version incompatibility between 1.8.7 en higher