Js bugfix

fixes DSC-606