Attempt to fix too small grace issues