Proper handling of manual turn changes