Fixes redundant checks.
Merge pull request #294 from koo04/master

Fixes redundant checks.