Workaround for CENTRALSRV-35