Handle Ghosts dependancy ugly for now