Continued fixing 1.2.js