Hotfix for panda