Implementing #161, part deux