Re: #431 - final fix for minification