Fixed #805.