[needs cr] fix move-discussio bug