commit #342