Fix Morocco and Malta