fixed commit #344