Final composer fix