Fixed #673