Use full name instead of handle