commit #658