Fix for 20 minute matches? Maybe