Fixes 2293.

Confirmed fixed with 1.3.0-beta.17.