This was fixed for 1.0.3 and despite cherry-picking the fix on master I just realized we still have the issue on master. So I reopen this