Fixed a bug with matchstar