Temp incomplete patch for #117