Issue #287 Remove the match capture