Fix strategy implementation
Merge pull request #67 from nlegoff/fix-strategy

Fix strategy implementation