Resolved potential errors