Somehow forgot to push a merge fix