(try to) fix #4536,
cleanup