fixed #558