Fixed calls to create/delete #6445