fixed #659