Fixed another bug with matchstar