final bug fix

Prepare completed 3 task