Ah, the joys of recycled code. Hopefully, this can be fixed...