Forgot to disable two calls