Fixed issue with visibility