Attempted fix for #881 - didn't work.