Custom.js fix from test 3