Maybe helps with #782