fix #4098
cleanup