bug fix and minified