extra creative checks
Merge pull request #368 from way2muchnoise/1.7-update

extra creative checks