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

5.2