Another attempt to fix minification errors