Updated to work with cassette 2.2.0.