almost fix 8.7