Found undefined issues, trying to fix