Fixed blackbox patch to be less messy.