Fix: Fix matrix environments