Partial fix for slow pageloads