Added correct check for calls