Fixed the use of matrix environment in non-matrix builds