[PMD-987] Fix, returning correct response.
Merge pull request #551 from e-cuellar/master

[PMD-987] Fix, returning correct response.