Fix #1241
Signed-off-by:KProvance <kevin.provance@gmail.com>
More JS on demand mods
Signed-off-by:KProvance <kevin.provance@gmail.com>