Bug Fixed

Major bug fixed