fixed beta7 issues.