Remove UNNECESSARY material fix logic???