bugfix
Merge pull request #1 from ChiChou/temp

bugfix