commit #246