CB-6964 fixed script