mmmhkay, I really really suck. refs #182 again.