commit #647