changed to make it work with minification