Fixed a bug that caused Tempalte creeation to hang with the newly added 'owner' Foreign Key Constraint