Improved fight collision