Added check for this in class scope