Trying to fix toggle wrapper