fixed #824