Implement right semantics for wait with version