fixes
Merge pull request #279 from will123195/3.0

fixes