Please use separate commit for this fix, so we can easily cherry-pick it if needed.