Fix bug in Via Padlock support

Backport of cf201201 from the 1.3 branch
2 files changed