Less cleaning, try for fix #183