fixes #296, closing cleaner