fix ivs/ecb handling