Bugfix W PaVe form factors