Fixed issues due to the renaming of 2 functions