Better Holo dept-loop prevention