fix one bug
Merge branch 'working'