fixed #331