commit #348