adapt code to 1.8.7