More attempts to fix #1263