Fixed #692