Possibly fixed match start bug