adding isset() check