Since I can't remember that this ever happened we could remove this or at least remove the TODO