Fixes #1030 Warning class issues.
Merge pull request #1100 from Sama34/fix-1030

Fixes #1030 Warning class issues.