Fixed preserving valves and empty buckets.