8 Commits (res-fixbug)