Fix onlyOne strategy