fixed #355