refs #17: take 2