Fixed handling of proper names