fixed #479