Fixed #830