hmm.. didn't see that. This line makes me less confident about this change. Let me do some more test before merging.