fixed #816