Updated adapter so it dies not display a warning