fixed #809