Fixed issues with displaying ghost