Fix isset bugs