Right list fixed issues