Could you check this PR again, I've modified the previous one as you suggested.