TODO for fixing the getMatch return type