fixed order of fun to fix match