fixed #510