fixed #537