1729 vp correct behavior

One more fix for that 1729 bug, hopefully the last one.