Fixed #814.