fix #279
cleanup