Another David Lamkins patch.