fixed isset() conditionals