HL-2224: One more fix.