Fixed #830.