fixes #2614 maintenance