try to fix 1.8.7