Need to fix on Fight controller