Update for error fixing
Merge branch 'error-fix'