Fixed Major Bug in last Commit

Same has previous commit