Correct failing VEPSO related code.

This might not yet be fully correct? Need to verify.

Signed-off-by: Gary Pamparà <gpampara@gmail.com>