fixed #613