HL-2224: Fixed a dependecy issue... I hope.