commit #649