fix issue 01 bug
merge bug fix issue 01