ticket:6 fix script