Fixed through 666b00a