support 1.8.7