Fix the hiding of handles