This seems to be taken care of.