Minor changes
Checking whether the error was in this function