Fix isset support