Major bug removed