I think I found the solution to avoid the Diving bug

Printable View