fixed the *** issue