Proper handling of domains