Try to fix #2093
Test for #2093