Corrected bug found (Problems not tested yet)