This isn't right. Why was this change required?