Final composer fix?