fixed match methods