make it works with 4.8.6