fix for 1271