bug fix and doing long run test