commit #587