Hotfix for wrong class loading

PR for hotfix