fixed beta5 issues.