commit #339