This bug should be dead now!