Fixing one more possible point of failure