Fixed '5 is depreciated' error