Settings loaded at wrong time
Upped version