fixed 1.8.7