Fix for use in VPAW 2