should help with #882