fixed #550