Maybe fix #1259