This should fix the failure.

Verified with testbranch.