Fixed fighting bug

Please enter the commit message for your changes. Lines starting