commit #646