Re-eliminate the fatal error I reintroduced in my last commit