Update gh-1620 with the code that reproduces the issue