fix issues on rebase
Merge pull request #1 from Carreau/fix-9

fix issues on rebase