fixed #830