Trying to fix mistakes