Bugfix for custodian.