Attempt to fix broken log loading
Merge branch 'loading'