Try to fix #2264 with Thomas help.