Add check on both spi and propnum match