Forgot to commit critical code fix