Fix double create/add issue.

Progress towards: tracker item 3584