Fixed depricated issue
