BUG: Fix handle visibility issue