added condition for wrappers