Bug fix & change composer