Fixed issue with mask's being visible on selection