Merge pull request #3631 from FernetMenta/segfault