fixes#2754 maintenance