Update for MATE 1.8