fixed #478