Passive Checkout fix

ported from 201301