Fixed transaction bugs by explicit pass-through