Matching with 1.3.1 release