Fixing again some extra space stuff.