update to make it work for 1.8.7