Finally fixed this issue. The material overlay was not working anywhere, so this should fix more than this issue.

Fixed locally, will move after submit.