Fixed problem with first run adapter