Merge pull request #1675 from dibdot/material-fix