Fixed naughty next bug