Fixed Major Bug