I don't have a CD drive to test this, but I've attempted a fix in f903121.