fixed #486