PLA-399 js fix