Added onCompletion corner cases