fixes #246
cleanup