added isset() check