PreviewBattle Fix
more fix
fix more more
i tired....
Merge branch 'master'