update to allow upcoming fork