Fixed #651