Add error avoidance for testing