Fix issue with destroy in visibility