fix bug 001
merged bug fix bug 001