fixed bug with 1.8.7