VPA behavior is affected by origin mode
Fix CBT behavior
Version 0.3.3.7