Fixed some incompatibility with 1.8.7