use cassettes + fix bug