Fix strategy implementation