Fix Extra Space