I think this addresses bug #3.