v1.7 fixed bugs from team test