fixed #666