Bug fixing [No Content] pull request by Igor Santos