fixed #612