Fixing clashing issues with below base matras