Merge pull request #3551 from gadelat/voids

Fixed inconsistent return types