fixed #336