Yeah, yours is better. New pull request is on the way...