Forgot one part of the fix