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