fixes #26, cleaning properly