Last merge broke plexpass - need to investigate