Fixed * bug