changes for support 1.8.7