ticket:6 Fix js