some inconsistencies fixed for matrix.size=1