fix housekeeping