Fix this to prevent future errors