Fix error with new accounts?