Adjusted to be compatible with 1.8.7