You can try Kurviger 1.13.16 (Beta) where that situation has been improved. (either with strict navigation or without it)