fixed #539