Extra defensive code
Merge