Major bug fix -SoulByte