attempt to patch fixes back to master