Fix behavior-wrapped handling.