Avoid ls error for volume cycle, tweak p match code