fixed bugs
trying to fix runtime errors
Merge branch 'hotfix/bug_fix'