Fix code + Fix new update from composer