make code 1.8.7 compatible

Make code 1.8.7 compatible.