Final touches to fix #2755