fixed error
Merge pull request #854 from adamarla/master

fixed error