Fix bug hide/show (to be improved)