fixed #669