Changed the wait on swap_instance