Make ezrss more robust