Sounds like this was another bug? Could you make it be in its own commit?