code improvement for bug fix