Fixed infinite loop with calling station name