Fixed #12 (good idea, Doug!)