$SAFE correction ahead