Swap method for closure

Change-Id: I848f19c34d6e302a71a3d0a845add5fdfea5acd8