Conforming min.js to "Fallback implemented and fancy stuff added" commit