2.4.1 -- Fix dependency ordering