Js dsc240

@ninhnguyen this should fix the issues you were seeing.