Revert clamp to zero and use another attempt fix for vpX0/Y0

Revert clamp to zero and use another attempt fix from @unknownbrackets