Fixed js uglification issue (finally)