Make global_matrix option work