Switch to 1.8.7 compatible syntax