fix from Mario for local cleanup