Reproduce #534
Fixed #534