pbvs

Hi @tonyqus , @Bykiev , @Zt-freak , I was looking into this and I was wondering if I could suggest an alternate solution to the problem. Basically our solution works...

@Bykiev Sure no problem, I will create the change as described above, do some additional testing and create a pull request when finished.