Uncomment defer [oops]