Use the right wait-for-state