Yes, I think you are right - we should figure out how to fix this.