Hotfix for Condor