Pandora temporary fix