bug fix 001, and solve 005