Fixing match subscription #11