fixed #826 ?