Attempted fix for #1357