Fix for the way that autocreation happens