Removed repeated conditional check
Merge pull request #580 from hneuer/pecond

Removed repeated conditional check