commit #651