Added a change that should be a bug fix, but for some reason is breaking the build.