Hotfix for wrong class loading