Bug fixes
rematch bug strikes back