commit #669