commit #597