fixing visibility bugs