fixed #498