fix for not setting payment instrument correctly