Yet another attempt to fix #2687