Fix bug F5 and bug return