ticket:6 js fix