Cleaning one tilde iss #8