Housekeeping fix