fixed subscription mathcing #7