Return old behavior to trap, introduce wrap instead