12 Commits (fix-js)