Avoid cluttering enviroment [Closes: issue1350]