Fixed several bugs for single matches