@zaach can we add a test for this please? Tracking in #939.