Removed empty check on name