make_unaware fix