Bug fix for custodian.