Fixed missing support for matrix parameters