Updates for fix #1281