CAL-156 fix javascript