Fixed Major Bug Issue 008.