Try to fix #2093