Fix #334

This addresses an issue when auto creating UUIDs for existing instances