First step in fixing make_secret