I sent patch to David Bell.
I will update here with his reply.