Feature/fix gzip performance