Please send separate pull request for this fix.