Fix Cassette ordering