Fixed #605