I'm sorry for late response.
I've updated my patch in 46f08ad.
Please review again.