fixed matches stuff