fixed conflict on Matrix vs. ***