Fixing bugs
Pumping dependency