Correct place to return
Correct condition to if
Merge pull request #2 from bem/gela-d

Correct place to return