Update to fix for #1064 and tests