Fixing Issue_400

Signed-off-by: Dinis Cruz <dinis.cruz@owasp.org>