Added PR 870 from FernetMenta