Bugfixing ejecting, currently broken (severely)