Fixture loading fix backport to 2.4