.
Merge pull request #1039 from nikeee/master

Should fix test error