Merge pull request #2043 from Ansuel/materialfix