Fixing eject class