fixing match class params