Lint Fix
Merge pull request #1402 from psav/lint_fix

Lint Fix