Hopefully fix for #839