fixed #946