Fixing the SAFE