fixes#2842 maintenance