Added support for RuntimeJS
locale fix