fixed #599