1.21 - correct album mode switches.