Fixed #605.