fixed #589