Problems in previos commit