Make compatible with 1.8.7