Hopefully fixed site slowdown bug