* * bug fixed