Fix popular block overflow