fixed
Merge branch 'hotfix/frame_rate_fix'