Migrated to MATE 1.6